drm/i915: edp resume/On time optimization.
Subsystems (2)
PATCH v4 1/1 drm/i915: edp resume/On time optimization.
From: Abhay Kumar <[email protected]>
Make resume/on codepath not to wait for panel_power_cycle_delay(t11_t12) if this time is already spent in suspend/poweron time.
v2: Use CLOCK_BOOTTIME and remove jiffies for panel power cycle
delay calculation(Ville).
v3: Addressed below comments
1. Tracking time from where last powercycle is initiated.
2. Used ktime_get_bootime() wrapper for boottime clock.
3. Used ktime_ms_delta() to get time difference.
v4: Updated v3 change log in detail.
--- drivers/gpu/drm/i915/intel_dp.c | 19 ++++++++++++++----- drivers/gpu/drm/i915/intel_drv.h | 2 +- 2 files changed, 15 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +14 -5
@@ -1812,12 +1812,21 @@ static void wait_panel_off(struct intel_dp *intel_dp)static void wait_panel_power_cycle (struct intel_dp *intel_dp) { +static ktime_t panel_power_on_time; +s64 panel_power_off_duration; +DRM_DEBUG_KMS ("Wait for panel power cycle\n" ); +/* take the difference of currrent time and panel power off time +* and then make panel wait for t11_t12 if needed. */ + panel_power_on_time =ktime_get_boottime (); + panel_power_off_duration =ktime_ms_delta (panel_power_on_time, intel_dp->panel_power_off_time); +/* When we disable the VDD override bit last we have to do the manual * wait. */ -wait_remaining_ms_from_jiffies (intel_dp->last_power_cycle, - intel_dp->panel_power_cycle_delay); +if (panel_power_off_duration < (s64 )intel_dp->panel_power_cycle_delay) +wait_remaining_ms_from_jiffies (jiffies, + intel_dp->panel_power_cycle_delay - panel_power_off_duration);wait_panel_status (intel_dp,IDLE_CYCLE_MASK ,IDLE_CYCLE_VALUE ); }
@@ -1969,7 +1978,7 @@ static void edp_panel_vdd_off_sync(struct intel_dp *intel_dp) I915_READ(pp_stat_reg), I915_READ(pp_ctrl_reg));if ((pp &POWER_TARGET_ON ) ==0 ) - intel_dp->last_power_cycle = jiffies; + intel_dp->panel_power_off_time =ktime_get_boottime (); power_domain =intel_display_port_aux_power_domain (intel_encoder);intel_display_power_put (dev_priv, power_domain);
@@ -2118,7 +2127,7 @@ static void edp_panel_off(struct intel_dp *intel_dp)I915_WRITE (pp_ctrl_reg, pp);POSTING_READ (pp_ctrl_reg); - intel_dp->last_power_cycle = jiffies; + intel_dp->panel_power_off_time =ktime_get_boottime ();wait_panel_off (intel_dp);/* We got a reference when we enabled the VDD. */
@@ -5122,7 +5131,7 @@ intel_dp_add_properties(struct intel_dp *intel_dp, struct drm_connector *connectstatic void intel_dp_init_panel_power_timestamps (struct intel_dp *intel_dp) { - intel_dp->last_power_cycle = jiffies; + intel_dp->panel_power_off_time =ktime_get_boottime (); intel_dp->last_power_on = jiffies; intel_dp->last_backlight_off = jiffies; }
drivers/gpu/drm/i915/intel_drv.h +1 -1
@@ -793,9 +793,9 @@ struct intel_dp {int backlight_off_delay;struct delayed_work panel_vdd_work;bool want_panel_vdd; -unsigned long last_power_cycle;unsigned long last_power_on;unsigned long last_backlight_off; +ktime_t panel_power_off_time;struct notifier_block edp_notifier;
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 8 lines · On 01/13/2016 07:27 AM, [email protected] wrote:
From: Abhay Kumar <[email protected]>
Make resume/on codepath not to wait for
panel_power_cycle_delay(t11_t12)if this time is already spent in suspend/poweron time.v2: Use
CLOCK_BOOTTIMEand remove jiffies for panel power cycle
delay calculation(Ville).
Quoted 6 lines
v3: Addressed below comments
1. Tracking time from where last powercycle is initiated.
2. Usedktime_get_bootime()wrapper for boottime clock.
3. Usedktime_ms_delta()to get time difference.v4: Updated v3 change log in detail.
Quick tip, you can use --in-reply-to while sending to maintain context, unless there is major rewrite of patches.
Regards
Shobhit
Quoted 69 lines
Cc Ville Syrjälä <[email protected]>Signed-off-by Abhay Kumar <[email protected]>--- drivers/gpu/drm/i915/intel_dp.c | 19 ++++++++++++++----- drivers/gpu/drm/i915/intel_drv.h | 2 +- 2 files changed, 15 insertions(+), 6 deletions(-)drivers/gpu/drm/i915/intel_dp.c +14
-5@@ -1812,12 +1812,21 @@ static void wait_panel_off(struct intel_dp *intel_dp)static void wait_panel_power_cycle (struct intel_dp *intel_dp) { +static ktime_t panel_power_on_time; +s64 panel_power_off_duration; +DRM_DEBUG_KMS ("Wait for panel power cycle\n" ); +/* take the difference of currrent time and panel power off time +* and then make panel wait for t11_t12 if needed. */ + panel_power_on_time =ktime_get_boottime (); + panel_power_off_duration =ktime_ms_delta (panel_power_on_time, intel_dp->panel_power_off_time); +/* When we disable the VDD override bit last we have to do the manual * wait. */ -wait_remaining_ms_from_jiffies (intel_dp->last_power_cycle, - intel_dp->panel_power_cycle_delay); +if (panel_power_off_duration < (s64 )intel_dp->panel_power_cycle_delay) +wait_remaining_ms_from_jiffies (jiffies, + intel_dp->panel_power_cycle_delay - panel_power_off_duration);wait_panel_status (intel_dp,IDLE_CYCLE_MASK ,IDLE_CYCLE_VALUE ); }@@ -1969,7 +1978,7 @@ static void edp_panel_vdd_off_sync(struct intel_dp *intel_dp) I915_READ(pp_stat_reg), I915_READ(pp_ctrl_reg));if ((pp &POWER_TARGET_ON ) ==0 ) - intel_dp->last_power_cycle = jiffies; + intel_dp->panel_power_off_time =ktime_get_boottime (); power_domain =intel_display_port_aux_power_domain (intel_encoder);intel_display_power_put (dev_priv, power_domain);@@ -2118,7 +2127,7 @@ static void edp_panel_off(struct intel_dp *intel_dp)I915_WRITE (pp_ctrl_reg, pp);POSTING_READ (pp_ctrl_reg); - intel_dp->last_power_cycle = jiffies; + intel_dp->panel_power_off_time =ktime_get_boottime ();wait_panel_off (intel_dp);/* We got a reference when we enabled the VDD. */ @@ -5122,7 +5131,7 @@ intel_dp_add_properties(struct intel_dp *intel_dp, struct drm_connector *connectstatic void intel_dp_init_panel_power_timestamps (struct intel_dp *intel_dp) { - intel_dp->last_power_cycle = jiffies; + intel_dp->panel_power_off_time =ktime_get_boottime (); intel_dp->last_power_on = jiffies; intel_dp->last_backlight_off = jiffies; }drivers/gpu/drm/i915/intel_drv.h +0
-0
drivers/gpu/drm/i915/intel_drv.h struct intel_dp { · line 801
Quoted 10 lines
drivers/gpu/drm/i915/intel_drv.h +1
-1@@ -793,9 +793,9 @@ struct intel_dp {int backlight_off_delay;struct delayed_work panel_vdd_work;bool want_panel_vdd; -unsigned long last_power_cycle;unsigned long last_power_on;unsigned long last_backlight_off; +ktime_t panel_power_off_time;struct notifier_block edp_notifier;
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ warning: Fi.CI.BAT
In reply to [email protected]== Summary ==
== Summary ==
Built on dd4a7926b4118f72b7ae0f7b97e9644172df472c drm-intel-nightly: 2016y-01m-13d-09h-05m-34s UTC integration manifest
Test gem_storedw_loop:
Subgroup basic-render:
pass -> DMESG-WARN (skl-i5k-2) UNSTABLE
pass -> DMESG-WARN (bdw-ultra)
Test kms_pipe_crc_basic:
Subgroup read-crc-pipe-a:
pass -> DMESG-WARN (byt-nuc)bdw-nuci7 total:138 pass:129 dwarn:0 dfail:0 fail:0 skip:9 bdw-ultra total:138 pass:131 dwarn:1 dfail:0 fail:0 skip:6 bsw-nuc-2 total:141 pass:115 dwarn:2 dfail:0 fail:0 skip:24 byt-nuc total:141 pass:122 dwarn:4 dfail:0 fail:0 skip:15 hsw-brixbox total:141 pass:134 dwarn:0 dfail:0 fail:0 skip:7 hsw-gt2 total:141 pass:137 dwarn:0 dfail:0 fail:0 skip:4 hsw-xps12 total:138 pass:133 dwarn:1 dfail:0 fail:0 skip:4 ilk-hp8440p total:141 pass:101 dwarn:3 dfail:0 fail:0 skip:37 ivb-t430s total:135 pass:122 dwarn:3 dfail:4 fail:0 skip:6 skl-i5k-2 total:141 pass:131 dwarn:2 dfail:0 fail:0 skip:8 skl-i7k-2 total:141 pass:131 dwarn:2 dfail:0 fail:0 skip:8 snb-dellxps total:141 pass:122 dwarn:5 dfail:0 fail:0 skip:14 snb-x220t total:141 pass:122 dwarn:5 dfail:0 fail:1 skip:13
Results at /archive/results/CI_IGT_test/Patchwork_1160/
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 82 lines · Abhay
From: Abhay Kumar <[email protected]>
Make resume/on codepath not to wait for
panel_power_cycle_delay(t11_t12)if this time is already spent in suspend/poweron time.v2: Use
CLOCK_BOOTTIMEand remove jiffies for panel power cycle
delay calculation(Ville).v3: Addressed below comments
1. Tracking time from where last powercycle is initiated.
2. Usedktime_get_bootime()wrapper for boottime clock.
3. Usedktime_ms_delta()to get time difference.v4: Updated v3 change log in detail.
Cc Ville Syrjälä <[email protected]>Signed-off-by Abhay Kumar <[email protected]>--- drivers/gpu/drm/i915/intel_dp.c | 19 ++++++++++++++----- drivers/gpu/drm/i915/intel_drv.h | 2 +- 2 files changed, 15 insertions(+), 6 deletions(-)drivers/gpu/drm/i915/intel_dp.c +14
-5@@ -1812,12 +1812,21 @@ static void wait_panel_off(struct intel_dp *intel_dp)static void wait_panel_power_cycle (struct intel_dp *intel_dp) { +static ktime_t panel_power_on_time; +s64 panel_power_off_duration; +DRM_DEBUG_KMS ("Wait for panel power cycle\n" ); +/* take the difference of currrent time and panel power off time +* and then make panel wait for t11_t12 if needed. */ + panel_power_on_time =ktime_get_boottime (); + panel_power_off_duration =ktime_ms_delta (panel_power_on_time, intel_dp->panel_power_off_time); +/* When we disable the VDD override bit last we have to do the manual * wait. */ -wait_remaining_ms_from_jiffies (intel_dp->last_power_cycle, - intel_dp->panel_power_cycle_delay); +if (panel_power_off_duration < (s64 )intel_dp->panel_power_cycle_delay) +wait_remaining_ms_from_jiffies (jiffies, + intel_dp->panel_power_cycle_delay - panel_power_off_duration);wait_panel_status (intel_dp,IDLE_CYCLE_MASK ,IDLE_CYCLE_VALUE ); }@@ -1969,7 +1978,7 @@ static void edp_panel_vdd_off_sync(struct intel_dp *intel_dp) I915_READ(pp_stat_reg), I915_READ(pp_ctrl_reg));if ((pp &POWER_TARGET_ON ) ==0 ) - intel_dp->last_power_cycle = jiffies; + intel_dp->panel_power_off_time =ktime_get_boottime (); power_domain =intel_display_port_aux_power_domain (intel_encoder);intel_display_power_put (dev_priv, power_domain);@@ -2118,7 +2127,7 @@ static void edp_panel_off(struct intel_dp *intel_dp)I915_WRITE (pp_ctrl_reg, pp);POSTING_READ (pp_ctrl_reg); - intel_dp->last_power_cycle = jiffies; + intel_dp->panel_power_off_time =ktime_get_boottime ();wait_panel_off (intel_dp);/* We got a reference when we enabled the VDD. */ @@ -5122,7 +5131,7 @@ intel_dp_add_properties(struct intel_dp *intel_dp, struct drm_connector *connectstatic void intel_dp_init_panel_power_timestamps (struct intel_dp *intel_dp) { - intel_dp->last_power_cycle = jiffies; + intel_dp->panel_power_off_time =ktime_get_boottime (); intel_dp->last_power_on = jiffies; intel_dp->last_backlight_off = jiffies; }drivers/gpu/drm/i915/intel_drv.h +0
-0
drivers/gpu/drm/i915/intel_drv.h struct intel_dp { · line 801
Quoted 10 lines
drivers/gpu/drm/i915/intel_drv.h +1
-1@@ -793,9 +793,9 @@ struct intel_dp {int backlight_off_delay;struct delayed_work panel_vdd_work;bool want_panel_vdd; -unsigned long last_power_cycle;unsigned long last_power_on;unsigned long last_backlight_off; +ktime_t panel_power_off_time;struct notifier_block edp_notifier;
Hi Ville,
If we have everything addressed can we please get this pulled into
drm-nightly?
Regards,
Abhay Kumar
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 82 lines · Abhay
From: Abhay Kumar <[email protected]>
Make resume/on codepath not to wait for
panel_power_cycle_delay(t11_t12)if this time is already spent in suspend/poweron time.v2: Use
CLOCK_BOOTTIMEand remove jiffies for panel power cycle
delay calculation(Ville).v3: Addressed below comments
1. Tracking time from where last powercycle is initiated.
2. Usedktime_get_bootime()wrapper for boottime clock.
3. Usedktime_ms_delta()to get time difference.v4: Updated v3 change log in detail.
Cc Ville Syrjälä <[email protected]>Signed-off-by Abhay Kumar <[email protected]>--- drivers/gpu/drm/i915/intel_dp.c | 19 ++++++++++++++----- drivers/gpu/drm/i915/intel_drv.h | 2 +- 2 files changed, 15 insertions(+), 6 deletions(-)drivers/gpu/drm/i915/intel_dp.c +14
-5@@ -1812,12 +1812,21 @@ static void wait_panel_off(struct intel_dp *intel_dp)static void wait_panel_power_cycle (struct intel_dp *intel_dp) { +static ktime_t panel_power_on_time; +s64 panel_power_off_duration; +DRM_DEBUG_KMS ("Wait for panel power cycle\n" ); +/* take the difference of currrent time and panel power off time +* and then make panel wait for t11_t12 if needed. */ + panel_power_on_time =ktime_get_boottime (); + panel_power_off_duration =ktime_ms_delta (panel_power_on_time, intel_dp->panel_power_off_time); +/* When we disable the VDD override bit last we have to do the manual * wait. */ -wait_remaining_ms_from_jiffies (intel_dp->last_power_cycle, - intel_dp->panel_power_cycle_delay); +if (panel_power_off_duration < (s64 )intel_dp->panel_power_cycle_delay) +wait_remaining_ms_from_jiffies (jiffies, + intel_dp->panel_power_cycle_delay - panel_power_off_duration);wait_panel_status (intel_dp,IDLE_CYCLE_MASK ,IDLE_CYCLE_VALUE ); }@@ -1969,7 +1978,7 @@ static void edp_panel_vdd_off_sync(struct intel_dp *intel_dp) I915_READ(pp_stat_reg), I915_READ(pp_ctrl_reg));if ((pp &POWER_TARGET_ON ) ==0 ) - intel_dp->last_power_cycle = jiffies; + intel_dp->panel_power_off_time =ktime_get_boottime (); power_domain =intel_display_port_aux_power_domain (intel_encoder);intel_display_power_put (dev_priv, power_domain);@@ -2118,7 +2127,7 @@ static void edp_panel_off(struct intel_dp *intel_dp)I915_WRITE (pp_ctrl_reg, pp);POSTING_READ (pp_ctrl_reg); - intel_dp->last_power_cycle = jiffies; + intel_dp->panel_power_off_time =ktime_get_boottime ();wait_panel_off (intel_dp);/* We got a reference when we enabled the VDD. */ @@ -5122,7 +5131,7 @@ intel_dp_add_properties(struct intel_dp *intel_dp, struct drm_connector *connectstatic void intel_dp_init_panel_power_timestamps (struct intel_dp *intel_dp) { - intel_dp->last_power_cycle = jiffies; + intel_dp->panel_power_off_time =ktime_get_boottime (); intel_dp->last_power_on = jiffies; intel_dp->last_backlight_off = jiffies; }drivers/gpu/drm/i915/intel_drv.h +0
-0
drivers/gpu/drm/i915/intel_drv.h struct intel_dp { · line 801
Quoted 10 lines
drivers/gpu/drm/i915/intel_drv.h +1
-1@@ -793,9 +793,9 @@ struct intel_dp {int backlight_off_delay;struct delayed_work panel_vdd_work;bool want_panel_vdd; -unsigned long last_power_cycle;unsigned long last_power_on;unsigned long last_backlight_off; +ktime_t panel_power_off_time;struct notifier_block edp_notifier;
Since this is already reviewed. Can we please get this Queued for -next ?
Regards,
Abhay Kumar
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 16 lines · Abhay
Quoted 13 lines · Abhay
From: Abhay Kumar <[email protected]>
Make resume/on codepath not to wait for
panel_power_cycle_delay(t11_t12)if this time is already spent in suspend/poweron time.v2: Use
CLOCK_BOOTTIMEand remove jiffies for panel power cycle
delay calculation(Ville).v3: Addressed below comments
1. Tracking time from where last powercycle is initiated.
2. Usedktime_get_bootime()wrapper for boottime clock.
3. Usedktime_ms_delta()to get time difference.
Quoted 4 lines
Quoted 4 lines
v4: Updated v3 change log in detail.
Cc Ville Syrjälä <[email protected]>Signed-off-by Abhay Kumar <[email protected]>
I can't see the r-b here nor anywhere else in this thread. That's why I didn't pick it up. Where is it?
-Daniel
Quoted 71 lines
Quoted 57 lines
--- drivers/gpu/drm/i915/intel_dp.c | 19 ++++++++++++++----- drivers/gpu/drm/i915/intel_drv.h | 2 +- 2 files changed, 15 insertions(+), 6 deletions(-)drivers/gpu/drm/i915/intel_dp.c +14
-5@@ -1812,12 +1812,21 @@ static void wait_panel_off(struct intel_dp *intel_dp)static void wait_panel_power_cycle (struct intel_dp *intel_dp) { +static ktime_t panel_power_on_time; +s64 panel_power_off_duration; +DRM_DEBUG_KMS ("Wait for panel power cycle\n" ); +/* take the difference of currrent time and panel power off time +* and then make panel wait for t11_t12 if needed. */ + panel_power_on_time =ktime_get_boottime (); + panel_power_off_duration =ktime_ms_delta (panel_power_on_time, intel_dp->panel_power_off_time); +/* When we disable the VDD override bit last we have to do the manual * wait. */ -wait_remaining_ms_from_jiffies (intel_dp->last_power_cycle, - intel_dp->panel_power_cycle_delay); +if (panel_power_off_duration < (s64 )intel_dp->panel_power_cycle_delay) +wait_remaining_ms_from_jiffies (jiffies, + intel_dp->panel_power_cycle_delay - panel_power_off_duration);wait_panel_status (intel_dp,IDLE_CYCLE_MASK ,IDLE_CYCLE_VALUE ); }@@ -1969,7 +1978,7 @@ static void edp_panel_vdd_off_sync(struct intel_dp *intel_dp) I915_READ(pp_stat_reg), I915_READ(pp_ctrl_reg));if ((pp &POWER_TARGET_ON ) ==0 ) - intel_dp->last_power_cycle = jiffies; + intel_dp->panel_power_off_time =ktime_get_boottime (); power_domain =intel_display_port_aux_power_domain (intel_encoder);intel_display_power_put (dev_priv, power_domain);@@ -2118,7 +2127,7 @@ static void edp_panel_off(struct intel_dp *intel_dp)I915_WRITE (pp_ctrl_reg, pp);POSTING_READ (pp_ctrl_reg); - intel_dp->last_power_cycle = jiffies; + intel_dp->panel_power_off_time =ktime_get_boottime ();wait_panel_off (intel_dp);/* We got a reference when we enabled the VDD. */ @@ -5122,7 +5131,7 @@ intel_dp_add_properties(struct intel_dp *intel_dp, struct drm_connector *connectstatic void intel_dp_init_panel_power_timestamps (struct intel_dp *intel_dp) { - intel_dp->last_power_cycle = jiffies; + intel_dp->panel_power_off_time =ktime_get_boottime (); intel_dp->last_power_on = jiffies; intel_dp->last_backlight_off = jiffies; }drivers/gpu/drm/i915/intel_drv.h +0
-0drivers/gpu/drm/i915/intel_drv.h struct intel_dp { · line 799
Quoted 8 lines
drivers/gpu/drm/i915/intel_drv.h +1
-1@@ -793,9 +793,9 @@ struct intel_dp {int backlight_off_delay;struct delayed_work panel_vdd_work;bool want_panel_vdd; -unsigned long last_power_cycle;unsigned long last_power_on;unsigned long last_backlight_off; +ktime_t panel_power_off_time;struct notifier_block edp_notifier;Since this is already reviewed. Can we please get this Queued for -next ?
Regards,
Abhay Kumar
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 17 lines · Daniel Vetter
Quoted 16 lines · Abhay
Quoted 13 lines · Abhay
From: Abhay Kumar <[email protected]>
Make resume/on codepath not to wait for
panel_power_cycle_delay(t11_t12)if this time is already spent in suspend/poweron time.v2: Use
CLOCK_BOOTTIMEand remove jiffies for panel power cycle
delay calculation(Ville).v3: Addressed below comments
1. Tracking time from where last powercycle is initiated.
2. Usedktime_get_bootime()wrapper for boottime clock.
3. Usedktime_ms_delta()to get time difference.
Quoted 7 lines
Quoted 4 lines
Quoted 4 lines
v4: Updated v3 change log in detail.
Cc Ville Syrjälä <[email protected]>Signed-off-by Abhay Kumar <[email protected]>I can't see the r-b here nor anywhere else in this thread. That's why I didn't pick it up. Where is it?
I didn't see it either. Ville can you please have a look at the latest changes.
Regards
Shobhit
Quoted 74 lines
-Daniel
Quoted 71 lines
Quoted 57 lines
--- drivers/gpu/drm/i915/intel_dp.c | 19 ++++++++++++++----- drivers/gpu/drm/i915/intel_drv.h | 2 +- 2 files changed, 15 insertions(+), 6 deletions(-)drivers/gpu/drm/i915/intel_dp.c +14
-5@@ -1812,12 +1812,21 @@ static void wait_panel_off(struct intel_dp *intel_dp)static void wait_panel_power_cycle (struct intel_dp *intel_dp) { +static ktime_t panel_power_on_time; +s64 panel_power_off_duration; +DRM_DEBUG_KMS ("Wait for panel power cycle\n" ); +/* take the difference of currrent time and panel power off time +* and then make panel wait for t11_t12 if needed. */ + panel_power_on_time =ktime_get_boottime (); + panel_power_off_duration =ktime_ms_delta (panel_power_on_time, intel_dp->panel_power_off_time); +/* When we disable the VDD override bit last we have to do the manual * wait. */ -wait_remaining_ms_from_jiffies (intel_dp->last_power_cycle, - intel_dp->panel_power_cycle_delay); +if (panel_power_off_duration < (s64 )intel_dp->panel_power_cycle_delay) +wait_remaining_ms_from_jiffies (jiffies, + intel_dp->panel_power_cycle_delay - panel_power_off_duration);wait_panel_status (intel_dp,IDLE_CYCLE_MASK ,IDLE_CYCLE_VALUE ); }@@ -1969,7 +1978,7 @@ static void edp_panel_vdd_off_sync(struct intel_dp *intel_dp) I915_READ(pp_stat_reg), I915_READ(pp_ctrl_reg));if ((pp &POWER_TARGET_ON ) ==0 ) - intel_dp->last_power_cycle = jiffies; + intel_dp->panel_power_off_time =ktime_get_boottime (); power_domain =intel_display_port_aux_power_domain (intel_encoder);intel_display_power_put (dev_priv, power_domain);@@ -2118,7 +2127,7 @@ static void edp_panel_off(struct intel_dp *intel_dp)I915_WRITE (pp_ctrl_reg, pp);POSTING_READ (pp_ctrl_reg); - intel_dp->last_power_cycle = jiffies; + intel_dp->panel_power_off_time =ktime_get_boottime ();wait_panel_off (intel_dp);/* We got a reference when we enabled the VDD. */ @@ -5122,7 +5131,7 @@ intel_dp_add_properties(struct intel_dp *intel_dp, struct drm_connector *connectstatic void intel_dp_init_panel_power_timestamps (struct intel_dp *intel_dp) { - intel_dp->last_power_cycle = jiffies; + intel_dp->panel_power_off_time =ktime_get_boottime (); intel_dp->last_power_on = jiffies; intel_dp->last_backlight_off = jiffies; }drivers/gpu/drm/i915/intel_drv.h +0
-0drivers/gpu/drm/i915/intel_drv.h struct intel_dp { · line 799
Quoted 8 lines
drivers/gpu/drm/i915/intel_drv.h +1
-1@@ -793,9 +793,9 @@ struct intel_dp {int backlight_off_delay;struct delayed_work panel_vdd_work;bool want_panel_vdd; -unsigned long last_power_cycle;unsigned long last_power_on;unsigned long last_backlight_off; +ktime_t panel_power_off_time;struct notifier_block edp_notifier;Since this is already reviewed. Can we please get this Queued for -next ?
Regards,
Abhay Kumar
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 20 lines · Shobhit
Quoted 19 lines · Daniel Vetter
Quoted 18 lines · Abhay
Quoted 15 lines · Abhay
From: Abhay Kumar <[email protected]>
Make resume/on codepath not to wait for
panel_power_cycle_delay(t11_t12)if this time is already spent in suspend/poweron time.v2: Use
CLOCK_BOOTTIMEand remove jiffies for panel power cycle
delay calculation(Ville).v3: Addressed below comments
1. Tracking time from where last powercycle is initiated.
2. Usedktime_get_bootime()wrapper for boottime clock.
3. Usedktime_ms_delta()to get time difference.v4: Updated v3 change log in detail.
Quoted 8 lines
Quoted 5 lines
Quoted 2 lines
Quoted 2 lines
Cc Ville Syrjälä <[email protected]>Signed-off-by Abhay Kumar <[email protected]>I can't see the r-b here nor anywhere else in this thread. That's why I didn't pick it up. Where is it?
I didn't see it either. Ville can you please have a look at the latest changes.
I don't think I'll bother since I'm pretty sure I already gave the r-b during the last round. People really should learn to hang on to the r-bs with some vigor.
Quoted 82 lines
Regards
ShobhitQuoted 74 lines
-Daniel
Quoted 71 lines
Quoted 57 lines
--- drivers/gpu/drm/i915/intel_dp.c | 19 ++++++++++++++----- drivers/gpu/drm/i915/intel_drv.h | 2 +- 2 files changed, 15 insertions(+), 6 deletions(-)drivers/gpu/drm/i915/intel_dp.c +14
-5@@ -1812,12 +1812,21 @@ static void wait_panel_off(struct intel_dp *intel_dp)static void wait_panel_power_cycle (struct intel_dp *intel_dp) { +static ktime_t panel_power_on_time; +s64 panel_power_off_duration; +DRM_DEBUG_KMS ("Wait for panel power cycle\n" ); +/* take the difference of currrent time and panel power off time +* and then make panel wait for t11_t12 if needed. */ + panel_power_on_time =ktime_get_boottime (); + panel_power_off_duration =ktime_ms_delta (panel_power_on_time, intel_dp->panel_power_off_time); +/* When we disable the VDD override bit last we have to do the manual * wait. */ -wait_remaining_ms_from_jiffies (intel_dp->last_power_cycle, - intel_dp->panel_power_cycle_delay); +if (panel_power_off_duration < (s64 )intel_dp->panel_power_cycle_delay) +wait_remaining_ms_from_jiffies (jiffies, + intel_dp->panel_power_cycle_delay - panel_power_off_duration);wait_panel_status (intel_dp,IDLE_CYCLE_MASK ,IDLE_CYCLE_VALUE ); }@@ -1969,7 +1978,7 @@ static void edp_panel_vdd_off_sync(struct intel_dp *intel_dp) I915_READ(pp_stat_reg), I915_READ(pp_ctrl_reg));if ((pp &POWER_TARGET_ON ) ==0 ) - intel_dp->last_power_cycle = jiffies; + intel_dp->panel_power_off_time =ktime_get_boottime (); power_domain =intel_display_port_aux_power_domain (intel_encoder);intel_display_power_put (dev_priv, power_domain);@@ -2118,7 +2127,7 @@ static void edp_panel_off(struct intel_dp *intel_dp)I915_WRITE (pp_ctrl_reg, pp);POSTING_READ (pp_ctrl_reg); - intel_dp->last_power_cycle = jiffies; + intel_dp->panel_power_off_time =ktime_get_boottime ();wait_panel_off (intel_dp);/* We got a reference when we enabled the VDD. */ @@ -5122,7 +5131,7 @@ intel_dp_add_properties(struct intel_dp *intel_dp, struct drm_connector *connectstatic void intel_dp_init_panel_power_timestamps (struct intel_dp *intel_dp) { - intel_dp->last_power_cycle = jiffies; + intel_dp->panel_power_off_time =ktime_get_boottime (); intel_dp->last_power_on = jiffies; intel_dp->last_backlight_off = jiffies; }drivers/gpu/drm/i915/intel_drv.h +0
-0drivers/gpu/drm/i915/intel_drv.h struct intel_dp { · line 799
Quoted 8 lines
drivers/gpu/drm/i915/intel_drv.h +1
-1@@ -793,9 +793,9 @@ struct intel_dp {int backlight_off_delay;struct delayed_work panel_vdd_work;bool want_panel_vdd; -unsigned long last_power_cycle;unsigned long last_power_on;unsigned long last_backlight_off; +ktime_t panel_power_off_time;struct notifier_block edp_notifier;Since this is already reviewed. Can we please get this Queued for -next ?
Regards,
Abhay Kumar_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 18 lines · Ville Syrjälä
Quoted 17 lines · Shobhit
Quoted 16 lines · Daniel Vetter
Quoted 15 lines · Abhay
Quoted 13 lines · Abhay
From: Abhay Kumar <[email protected]>
Make resume/on codepath not to wait for
panel_power_cycle_delay(t11_t12)if this time is already spent in suspend/poweron time.v2: Use
CLOCK_BOOTTIMEand remove jiffies for panel power cycle
delay calculation(Ville).v3: Addressed below comments
1. Tracking time from where last powercycle is initiated.
2. Usedktime_get_bootime()wrapper for boottime clock.
3. Usedktime_ms_delta()to get time difference.
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 4 lines
Quoted 4 lines
v4: Updated v3 change log in detail.
Cc Ville Syrjälä <[email protected]>Signed-off-by Abhay Kumar <[email protected]>I can't see the r-b here nor anywhere else in this thread. That's why I didn't pick it up. Where is it?
V3 of this patch was r-b by Ville and had comment on the commit msg. I updated commit msg and pushed V4. So practically there is no code change and Ville r-b should hold good.
Sorry in case i missed to keep that r-b by Ville in V3 here.
Quoted 85 lines
Quoted 2 lines
I didn't see it either. Ville can you please have a look at the latest changes.
I don't think I'll bother since I'm pretty sure I already gave the r-b during the last round. People really should learn to hang on to the r-bs with some vigor.
Quoted 79 lines
Regards
ShobhitQuoted 72 lines
-Daniel
Quoted 70 lines
Quoted 57 lines
--- drivers/gpu/drm/i915/intel_dp.c | 19 ++++++++++++++----- drivers/gpu/drm/i915/intel_drv.h | 2 +- 2 files changed, 15 insertions(+), 6 deletions(-)drivers/gpu/drm/i915/intel_dp.c +14
-5@@ -1812,12 +1812,21 @@ static void wait_panel_off(struct intel_dp *intel_dp)static void wait_panel_power_cycle (struct intel_dp *intel_dp) { +static ktime_t panel_power_on_time; +s64 panel_power_off_duration; +DRM_DEBUG_KMS ("Wait for panel power cycle\n" ); +/* take the difference of currrent time and panel power off time +* and then make panel wait for t11_t12 if needed. */ + panel_power_on_time =ktime_get_boottime (); + panel_power_off_duration =ktime_ms_delta (panel_power_on_time, intel_dp->panel_power_off_time); +/* When we disable the VDD override bit last we have to do the manual * wait. */ -wait_remaining_ms_from_jiffies (intel_dp->last_power_cycle, - intel_dp->panel_power_cycle_delay); +if (panel_power_off_duration < (s64 )intel_dp->panel_power_cycle_delay) +wait_remaining_ms_from_jiffies (jiffies, + intel_dp->panel_power_cycle_delay - panel_power_off_duration);wait_panel_status (intel_dp,IDLE_CYCLE_MASK ,IDLE_CYCLE_VALUE ); }@@ -1969,7 +1978,7 @@ static void edp_panel_vdd_off_sync(struct intel_dp *intel_dp) I915_READ(pp_stat_reg), I915_READ(pp_ctrl_reg));if ((pp &POWER_TARGET_ON ) ==0 ) - intel_dp->last_power_cycle = jiffies; + intel_dp->panel_power_off_time =ktime_get_boottime (); power_domain =intel_display_port_aux_power_domain (intel_encoder);intel_display_power_put (dev_priv, power_domain);@@ -2118,7 +2127,7 @@ static void edp_panel_off(struct intel_dp *intel_dp)I915_WRITE (pp_ctrl_reg, pp);POSTING_READ (pp_ctrl_reg); - intel_dp->last_power_cycle = jiffies; + intel_dp->panel_power_off_time =ktime_get_boottime ();wait_panel_off (intel_dp);/* We got a reference when we enabled the VDD. */ @@ -5122,7 +5131,7 @@ intel_dp_add_properties(struct intel_dp *intel_dp, struct drm_connector *connectstatic void intel_dp_init_panel_power_timestamps (struct intel_dp *intel_dp) { - intel_dp->last_power_cycle = jiffies; + intel_dp->panel_power_off_time =ktime_get_boottime (); intel_dp->last_power_on = jiffies; intel_dp->last_backlight_off = jiffies; }drivers/gpu/drm/i915/intel_drv.h +0
-0drivers/gpu/drm/i915/intel_drv.h struct intel_dp { · line 799
Quoted 8 lines
drivers/gpu/drm/i915/intel_drv.h +1
-1@@ -793,9 +793,9 @@ struct intel_dp {int backlight_off_delay;struct delayed_work panel_vdd_work;bool want_panel_vdd; -unsigned long last_power_cycle;unsigned long last_power_on;unsigned long last_backlight_off; +ktime_t panel_power_off_time;struct notifier_block edp_notifier;Since this is already reviewed. Can we please get this Queued for -next ?
Regards,
Abhay Kumar_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 24 lines · Abhay
Quoted 21 lines · Ville Syrjälä
Quoted 20 lines · Shobhit
Quoted 19 lines · Daniel Vetter
Quoted 18 lines · Abhay
Quoted 16 lines · Abhay
From: Abhay Kumar <[email protected]>
Make resume/on codepath not to wait for
panel_power_cycle_delay(t11_t12)
if this time is already spent in suspend/poweron time.v2: Use
CLOCK_BOOTTIMEand remove jiffies for panel power cycle
delay calculation(Ville).v3: Addressed below comments
1. Tracking time from where last powercycle is initiated.
2. Usedktime_get_bootime()wrapper for boottime clock.
3. Usedktime_ms_delta()to get time difference.v4: Updated v3 change log in detail.
Quoted 7 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 2 lines
Quoted 2 lines
Cc Ville Syrjälä <[email protected]>Signed-off-by Abhay Kumar <[email protected]>I can't see the r-b here nor anywhere else in this thread. That's why I didn't pick it up. Where is it?
V3 of this patch was r-b by Ville and had comment on the commit msg. I updated commit msg and pushed V4.
So practically there is no code change and Ville r-b should hold good.
Daniel, please wait before merging as another update is on the way because of some more review comments which also already has Ville's r-b
Regards
Shobhit
Quoted 103 lines
Sorry in case i missed to keep that r-b by Ville in V3 here.
Quoted 99 lines
Quoted 2 lines
I didn't see it either. Ville can you please have a look at the latest changes.
I don't think I'll bother since I'm pretty sure I already gave the r-b during the last round. People really should learn to hang on to the r-bs with some vigor.
Quoted 93 lines
Regards
ShobhitQuoted 86 lines
-Daniel
Quoted 84 lines
Quoted 70 lines
--- drivers/gpu/drm/i915/intel_dp.c | 19 ++++++++++++++----- drivers/gpu/drm/i915/intel_drv.h | 2 +- 2 files changed, 15 insertions(+), 6 deletions(-)drivers/gpu/drm/i915/intel_dp.c +8
-0@@ -1812,12 +1812,21 @@ static void wait_panel_off(struct intel_dp *intel_dp)static void wait_panel_power_cycle (struct intel_dp *intel_dp) { +static ktime_t panel_power_on_time; +s64 panel_power_off_duration; +DRM_DEBUG_KMS ("Wait for panel power cycle\n" ); +/* take the difference of currrent time and panel power off time +* and then make panel wait for t11_t12 if needed. */ + panel_power_on_time =ktime_get_boottime (); + panel_power_off_duration =ktime_ms_delta (panel_power_on_time, intel_dp->panel_power_off_time); +/* When we disable the VDD override bit last we have to do the manual
* wait. */drivers/gpu/drm/i915/intel_dp.c +1
-2-wait_remaining_ms_from_jiffies (intel_dp->last_power_cycle, - intel_dp->panel_power_cycle_delay); + if (panel_power_off_duration <(s64)intel_dp->panel_power_cycle_delay)
drivers/gpu/drm/i915/intel_dp.c +2
-0+ wait_remaining_ms_from_jiffies(jiffies, + intel_dp->panel_power_cycle_delay -
panel_power_off_duration);
wait_panel_status(intel_dp,IDLE_CYCLE_MASK,IDLE_CYCLE_VALUE); }drivers/gpu/drm/i915/intel_dp.c +3
-3@@ -1969,7 +1978,7 @@ static void edp_panel_vdd_off_sync(struct intel_dp *intel_dp) I915_READ(pp_stat_reg), I915_READ(pp_ctrl_reg));if ((pp &POWER_TARGET_ON ) ==0 ) - intel_dp->last_power_cycle = jiffies; + intel_dp->panel_power_off_time =ktime_get_boottime (); power_domain =intel_display_port_aux_power_domain (intel_encoder);intel_display_power_put (dev_priv, power_domain);@@ -2118,7 +2127,7 @@ static void edp_panel_off(struct intel_dp *intel_dp)I915_WRITE (pp_ctrl_reg, pp);POSTING_READ (pp_ctrl_reg); - intel_dp->last_power_cycle = jiffies; + intel_dp->panel_power_off_time =ktime_get_boottime ();wait_panel_off (intel_dp);/* We got a reference when we enabled the VDD. */ @@ -5122,7 +5131,7 @@ intel_dp_add_properties(struct intel_dp *intel_dp, struct drm_connector *connectstatic void intel_dp_init_panel_power_timestamps (struct intel_dp *intel_dp) { - intel_dp->last_power_cycle = jiffies; + intel_dp->panel_power_off_time =ktime_get_boottime (); intel_dp->last_power_on = jiffies; intel_dp->last_backlight_off = jiffies;}drivers/gpu/drm/i915/intel_drv.h +0
-0drivers/gpu/drm/i915/intel_drv.h struct intel_dp { · line 799
Quoted 8 lines
drivers/gpu/drm/i915/intel_drv.h +1
-1@@ -793,9 +793,9 @@ struct intel_dp {int backlight_off_delay;struct delayed_work panel_vdd_work;bool want_panel_vdd; -unsigned long last_power_cycle;unsigned long last_power_on;unsigned long last_backlight_off; +ktime_t panel_power_off_time;struct notifier_block edp_notifier;Since this is already reviewed. Can we please get this Queued for -next ?
Regards,
Abhay Kumar_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 27 lines · Shobhit
Quoted 26 lines · Abhay
Quoted 24 lines · Ville Syrjälä
Quoted 23 lines · Shobhit
Quoted 22 lines · Daniel Vetter
Quoted 15 lines · Abhay
Quoted 14 lines · Abhay
From: Abhay Kumar <[email protected]>
Make resume/on codepath not to wait for
panel_power_cycle_delay(t11_t12)
if this time is already spent in suspend/poweron time.v2: Use
CLOCK_BOOTTIMEand remove jiffies for panel power cycle
delay calculation(Ville).v3: Addressed below comments
1. Tracking time from where last powercycle is initiated.
2. Usedktime_get_bootime()wrapper for boottime clock.
3. Usedktime_ms_delta()to get time difference.Quoted 4 lines
Quoted 4 lines
v4: Updated v3 change log in detail.
Cc Ville Syrjälä <[email protected]>Signed-off-by Abhay Kumar <[email protected]>I can't see the r-b here nor anywhere else in this thread. That's why I didn't pick it up. Where is it?
Quoted 8 lines
Quoted 3 lines
V3 of this patch was r-b by Ville and had comment on the commit msg. I updated commit msg and pushed V4.
So practically there is no code change and Ville r-b should hold good.Daniel, please wait before merging as another update is on the way because of some more review comments which also already has Ville's r-b
Regards
Shobhit
Daniel, V5 of this patch is pushed,reviewed and looks good. Please Queue it.
Regards,
Abhay kumar
Quoted 95 lines
Quoted 95 lines
Sorry in case i missed to keep that r-b by Ville in V3 here.
Quoted 92 lines
Quoted 2 lines
I didn't see it either. Ville can you please have a look at the latest changes.
I don't think I'll bother since I'm pretty sure I already gave the r-b during the last round. People really should learn to hang on to the r-bs with some vigor.
Quoted 86 lines
Regards
ShobhitQuoted 83 lines
-Daniel
Quoted 81 lines
Quoted 70 lines
--- drivers/gpu/drm/i915/intel_dp.c | 19 ++++++++++++++----- drivers/gpu/drm/i915/intel_drv.h | 2 +- 2 files changed, 15 insertions(+), 6 deletions(-)drivers/gpu/drm/i915/intel_dp.c +8
-0@@ -1812,12 +1812,21 @@ static void wait_panel_off(struct intel_dp *intel_dp)static void wait_panel_power_cycle (struct intel_dp *intel_dp) { +static ktime_t panel_power_on_time; +s64 panel_power_off_duration; +DRM_DEBUG_KMS ("Wait for panel power cycle\n" ); +/* take the difference of currrent time and panel power off time +* and then make panel wait for t11_t12 if needed. */ + panel_power_on_time =ktime_get_boottime (); + panel_power_off_duration =ktime_ms_delta (panel_power_on_time, intel_dp->panel_power_off_time); +/* When we disable the VDD override bit last we have to do the manual
* wait. */drivers/gpu/drm/i915/intel_dp.c +1
-2-wait_remaining_ms_from_jiffies (intel_dp->last_power_cycle, - intel_dp->panel_power_cycle_delay); + if (panel_power_off_duration <(s64)intel_dp->panel_power_cycle_delay)
drivers/gpu/drm/i915/intel_dp.c +2
-0+ wait_remaining_ms_from_jiffies(jiffies, + intel_dp->panel_power_cycle_delay -
panel_power_off_duration);
wait_panel_status(intel_dp,IDLE_CYCLE_MASK,IDLE_CYCLE_VALUE); }drivers/gpu/drm/i915/intel_dp.c +3
-3@@ -1969,7 +1978,7 @@ static void edp_panel_vdd_off_sync(struct intel_dp *intel_dp) I915_READ(pp_stat_reg), I915_READ(pp_ctrl_reg));if ((pp &POWER_TARGET_ON ) ==0 ) - intel_dp->last_power_cycle = jiffies; + intel_dp->panel_power_off_time =ktime_get_boottime (); power_domain =intel_display_port_aux_power_domain (intel_encoder);intel_display_power_put (dev_priv, power_domain);@@ -2118,7 +2127,7 @@ static void edp_panel_off(struct intel_dp *intel_dp)I915_WRITE (pp_ctrl_reg, pp);POSTING_READ (pp_ctrl_reg); - intel_dp->last_power_cycle = jiffies; + intel_dp->panel_power_off_time =ktime_get_boottime ();wait_panel_off (intel_dp);/* We got a reference when we enabled the VDD. */ @@ -5122,7 +5131,7 @@ intel_dp_add_properties(struct intel_dp *intel_dp, struct drm_connector *connectstatic void intel_dp_init_panel_power_timestamps (struct intel_dp *intel_dp) { - intel_dp->last_power_cycle = jiffies; + intel_dp->panel_power_off_time =ktime_get_boottime (); intel_dp->last_power_on = jiffies; intel_dp->last_backlight_off = jiffies;}drivers/gpu/drm/i915/intel_drv.h +0
-0drivers/gpu/drm/i915/intel_drv.h struct intel_dp { · line 799
Quoted 8 lines
drivers/gpu/drm/i915/intel_drv.h +1
-1@@ -793,9 +793,9 @@ struct intel_dp {int backlight_off_delay;struct delayed_work panel_vdd_work;bool want_panel_vdd; -unsigned long last_power_cycle;unsigned long last_power_on;unsigned long last_backlight_off; +ktime_t panel_power_off_time;struct notifier_block edp_notifier;Since this is already reviewed. Can we please get this Queued for -next ?
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 3 lines
Quoted 3 lines
Regards,
Abhay Kumar_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v5 1/1 drm/i915: edp resume/On time optimization.
In reply to [email protected]From: Abhay Kumar <[email protected]>
Make resume/on codepath not to wait for panel_power_cycle_delay(t11_t12) if this time is already spent in suspend/poweron time.
v2: Use CLOCK_BOOTTIME and remove jiffies for panel power cycle
delay calculation(Ville).
v3: Addressed below comments
1. Tracking time from where last powercycle is initiated.
2. Used ktime_get_bootime() wrapper for boottime clock.
3. Used ktime_ms_delta() to get time difference.
v4: Updated v3 change log in detail.
v5: Removed static from panel_power_on_time(Stéphane).
--- drivers/gpu/drm/i915/intel_dp.c | 19 ++++++++++++++----- drivers/gpu/drm/i915/intel_drv.h | 2 +- 2 files changed, 15 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +14 -5
@@ -1811,12 +1811,21 @@ static void wait_panel_off(struct intel_dp *intel_dp)static void wait_panel_power_cycle (struct intel_dp *intel_dp) { +ktime_t panel_power_on_time; +s64 panel_power_off_duration; +DRM_DEBUG_KMS ("Wait for panel power cycle\n" ); +/* take the difference of currrent time and panel power off time +* and then make panel wait for t11_t12 if needed. */ + panel_power_on_time =ktime_get_boottime (); + panel_power_off_duration =ktime_ms_delta (panel_power_on_time, intel_dp->panel_power_off_time); +/* When we disable the VDD override bit last we have to do the manual * wait. */ -wait_remaining_ms_from_jiffies (intel_dp->last_power_cycle, - intel_dp->panel_power_cycle_delay); +if (panel_power_off_duration < (s64 )intel_dp->panel_power_cycle_delay) +wait_remaining_ms_from_jiffies (jiffies, + intel_dp->panel_power_cycle_delay - panel_power_off_duration);wait_panel_status (intel_dp,IDLE_CYCLE_MASK ,IDLE_CYCLE_VALUE ); }
@@ -1968,7 +1977,7 @@ static void edp_panel_vdd_off_sync(struct intel_dp *intel_dp) I915_READ(pp_stat_reg), I915_READ(pp_ctrl_reg));if ((pp &POWER_TARGET_ON ) ==0 ) - intel_dp->last_power_cycle = jiffies; + intel_dp->panel_power_off_time =ktime_get_boottime (); power_domain =intel_display_port_aux_power_domain (intel_encoder);intel_display_power_put (dev_priv, power_domain);
@@ -2117,7 +2126,7 @@ static void edp_panel_off(struct intel_dp *intel_dp)I915_WRITE (pp_ctrl_reg, pp);POSTING_READ (pp_ctrl_reg); - intel_dp->last_power_cycle = jiffies; + intel_dp->panel_power_off_time =ktime_get_boottime ();wait_panel_off (intel_dp);/* We got a reference when we enabled the VDD. */
@@ -5116,7 +5125,7 @@ intel_dp_add_properties(struct intel_dp *intel_dp, struct drm_connector *connectstatic void intel_dp_init_panel_power_timestamps (struct intel_dp *intel_dp) { - intel_dp->last_power_cycle = jiffies; + intel_dp->panel_power_off_time =ktime_get_boottime (); intel_dp->last_power_on = jiffies; intel_dp->last_backlight_off = jiffies; }
drivers/gpu/drm/i915/intel_drv.h +1 -1
@@ -770,9 +770,9 @@ struct intel_dp {int backlight_off_delay;struct delayed_work panel_vdd_work;bool want_panel_vdd; -unsigned long last_power_cycle;unsigned long last_power_on;unsigned long last_backlight_off; +ktime_t panel_power_off_time;struct notifier_block edp_notifier;
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 85 lines · Abhay
From: Abhay Kumar <[email protected]>
Make resume/on codepath not to wait for
panel_power_cycle_delay(t11_t12)if this time is already spent in suspend/poweron time.v2: Use
CLOCK_BOOTTIMEand remove jiffies for panel power cycle
delay calculation(Ville).v3: Addressed below comments
1. Tracking time from where last powercycle is initiated.
2. Usedktime_get_bootime()wrapper for boottime clock.
3. Usedktime_ms_delta()to get time difference.v4: Updated v3 change log in detail.
v5: Removed static from
panel_power_on_time(Stéphane).Cc Ville Syrjälä <[email protected]>Signed-off-by Abhay Kumar <[email protected]>Reviewed-by Ville Syrjälä <[email protected]>--- drivers/gpu/drm/i915/intel_dp.c | 19 ++++++++++++++----- drivers/gpu/drm/i915/intel_drv.h | 2 +- 2 files changed, 15 insertions(+), 6 deletions(-)drivers/gpu/drm/i915/intel_dp.c +14
-5@@ -1811,12 +1811,21 @@ static void wait_panel_off(struct intel_dp *intel_dp)static void wait_panel_power_cycle (struct intel_dp *intel_dp) { +ktime_t panel_power_on_time; +s64 panel_power_off_duration; +DRM_DEBUG_KMS ("Wait for panel power cycle\n" ); +/* take the difference of currrent time and panel power off time +* and then make panel wait for t11_t12 if needed. */ + panel_power_on_time =ktime_get_boottime (); + panel_power_off_duration =ktime_ms_delta (panel_power_on_time, intel_dp->panel_power_off_time); +/* When we disable the VDD override bit last we have to do the manual * wait. */ -wait_remaining_ms_from_jiffies (intel_dp->last_power_cycle, - intel_dp->panel_power_cycle_delay); +if (panel_power_off_duration < (s64 )intel_dp->panel_power_cycle_delay) +wait_remaining_ms_from_jiffies (jiffies, + intel_dp->panel_power_cycle_delay - panel_power_off_duration);wait_panel_status (intel_dp,IDLE_CYCLE_MASK ,IDLE_CYCLE_VALUE ); }@@ -1968,7 +1977,7 @@ static void edp_panel_vdd_off_sync(struct intel_dp *intel_dp) I915_READ(pp_stat_reg), I915_READ(pp_ctrl_reg));if ((pp &POWER_TARGET_ON ) ==0 ) - intel_dp->last_power_cycle = jiffies; + intel_dp->panel_power_off_time =ktime_get_boottime (); power_domain =intel_display_port_aux_power_domain (intel_encoder);intel_display_power_put (dev_priv, power_domain);@@ -2117,7 +2126,7 @@ static void edp_panel_off(struct intel_dp *intel_dp)I915_WRITE (pp_ctrl_reg, pp);POSTING_READ (pp_ctrl_reg); - intel_dp->last_power_cycle = jiffies; + intel_dp->panel_power_off_time =ktime_get_boottime ();wait_panel_off (intel_dp);/* We got a reference when we enabled the VDD. */ @@ -5116,7 +5125,7 @@ intel_dp_add_properties(struct intel_dp *intel_dp, struct drm_connector *connectstatic void intel_dp_init_panel_power_timestamps (struct intel_dp *intel_dp) { - intel_dp->last_power_cycle = jiffies; + intel_dp->panel_power_off_time =ktime_get_boottime (); intel_dp->last_power_on = jiffies; intel_dp->last_backlight_off = jiffies; }drivers/gpu/drm/i915/intel_drv.h +0
-0
drivers/gpu/drm/i915/intel_drv.h struct intel_dp { · line 778
Quoted 10 lines
drivers/gpu/drm/i915/intel_drv.h +1
-1@@ -770,9 +770,9 @@ struct intel_dp {int backlight_off_delay;struct delayed_work panel_vdd_work;bool want_panel_vdd; -unsigned long last_power_cycle;unsigned long last_power_on;unsigned long last_backlight_off; +ktime_t panel_power_off_time;struct notifier_block edp_notifier;
Hi Daniel,
can we please get this patch Queued?
Thanks
Regards,
Abhay Kumar
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Daniel Vetter
AppliedQuoted 13 lines · On Fri, Jan 22, 2016 at 05:39:04PM -0800, [email protected] wrote:
From: Abhay Kumar <[email protected]>
Make resume/on codepath not to wait for
panel_power_cycle_delay(t11_t12)if this time is already spent in suspend/poweron time.v2: Use
CLOCK_BOOTTIMEand remove jiffies for panel power cycle
delay calculation(Ville).v3: Addressed below comments
1. Tracking time from where last powercycle is initiated.
2. Usedktime_get_bootime()wrapper for boottime clock.
3. Usedktime_ms_delta()to get time difference.
Quoted 7 lines
v4: Updated v3 change log in detail.
v5: Removed static from
panel_power_on_time(Stéphane).Cc Ville Syrjälä <[email protected]>Signed-off-by Abhay Kumar <[email protected]>Reviewed-by Ville Syrjälä <[email protected]>
Queued for -next, thanks for the patch.
-Daniel
Quoted 82 lines
--- drivers/gpu/drm/i915/intel_dp.c | 19 ++++++++++++++----- drivers/gpu/drm/i915/intel_drv.h | 2 +- 2 files changed, 15 insertions(+), 6 deletions(-)drivers/gpu/drm/i915/intel_dp.c +14
-5@@ -1811,12 +1811,21 @@ static void wait_panel_off(struct intel_dp *intel_dp)static void wait_panel_power_cycle (struct intel_dp *intel_dp) { +ktime_t panel_power_on_time; +s64 panel_power_off_duration; +DRM_DEBUG_KMS ("Wait for panel power cycle\n" ); +/* take the difference of currrent time and panel power off time +* and then make panel wait for t11_t12 if needed. */ + panel_power_on_time =ktime_get_boottime (); + panel_power_off_duration =ktime_ms_delta (panel_power_on_time, intel_dp->panel_power_off_time); +/* When we disable the VDD override bit last we have to do the manual * wait. */ -wait_remaining_ms_from_jiffies (intel_dp->last_power_cycle, - intel_dp->panel_power_cycle_delay); +if (panel_power_off_duration < (s64 )intel_dp->panel_power_cycle_delay) +wait_remaining_ms_from_jiffies (jiffies, + intel_dp->panel_power_cycle_delay - panel_power_off_duration);wait_panel_status (intel_dp,IDLE_CYCLE_MASK ,IDLE_CYCLE_VALUE ); }@@ -1968,7 +1977,7 @@ static void edp_panel_vdd_off_sync(struct intel_dp *intel_dp) I915_READ(pp_stat_reg), I915_READ(pp_ctrl_reg));if ((pp &POWER_TARGET_ON ) ==0 ) - intel_dp->last_power_cycle = jiffies; + intel_dp->panel_power_off_time =ktime_get_boottime (); power_domain =intel_display_port_aux_power_domain (intel_encoder);intel_display_power_put (dev_priv, power_domain);@@ -2117,7 +2126,7 @@ static void edp_panel_off(struct intel_dp *intel_dp)I915_WRITE (pp_ctrl_reg, pp);POSTING_READ (pp_ctrl_reg); - intel_dp->last_power_cycle = jiffies; + intel_dp->panel_power_off_time =ktime_get_boottime ();wait_panel_off (intel_dp);/* We got a reference when we enabled the VDD. */ @@ -5116,7 +5125,7 @@ intel_dp_add_properties(struct intel_dp *intel_dp, struct drm_connector *connectstatic void intel_dp_init_panel_power_timestamps (struct intel_dp *intel_dp) { - intel_dp->last_power_cycle = jiffies; + intel_dp->panel_power_off_time =ktime_get_boottime (); intel_dp->last_power_on = jiffies; intel_dp->last_backlight_off = jiffies; }drivers/gpu/drm/i915/intel_drv.h +1
-1@@ -770,9 +770,9 @@ struct intel_dp {int backlight_off_delay;struct delayed_work panel_vdd_work;bool want_panel_vdd; -unsigned long last_power_cycle;unsigned long last_power_on;unsigned long last_backlight_off; +ktime_t panel_power_off_time;struct notifier_block edp_notifier;Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for drm/i915: edp resume/On time optimization. (rev10)
In reply to [email protected]== Summary ==
== Summary ==
Built on 8fe9e785ae04fa7c37f7935cff12d62e38054b60 drm-intel-nightly: 2016y-01m-21d-11h-02m-42s UTC integration manifest
Test gem_ctx_basic:
pass -> FAIL (bdw-ultra)
Test kms_flip:
Subgroup basic-flip-vs-dpms:
pass -> DMESG-WARN (ilk-hp8440p)bdw-nuci7 total:140 pass:131 dwarn:0 dfail:0 fail:0 skip:9 bdw-ultra total:143 pass:136 dwarn:0 dfail:0 fail:1 skip:6 bsw-nuc-2 total:143 pass:119 dwarn:0 dfail:0 fail:0 skip:24 byt-nuc total:143 pass:128 dwarn:0 dfail:0 fail:0 skip:15 hsw-brixbox total:143 pass:136 dwarn:0 dfail:0 fail:0 skip:7 hsw-gt2 total:143 pass:139 dwarn:0 dfail:0 fail:0 skip:4 ilk-hp8440p total:143 pass:103 dwarn:2 dfail:0 fail:0 skip:38 ivb-t430s total:143 pass:137 dwarn:0 dfail:0 fail:0 skip:6 skl-i5k-2 total:143 pass:134 dwarn:1 dfail:0 fail:0 skip:8 snb-dellxps total:143 pass:129 dwarn:0 dfail:0 fail:0 skip:14 snb-x220t total:143 pass:129 dwarn:0 dfail:0 fail:1 skip:13
Results at /archive/results/CI_IGT_test/Patchwork_1256/
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: ✗ Fi.CI.BAT: failure for drm/i915: edp resume/On time optimization. (rev10)
Quoted 6 lines · Patchwork
== Summary ==
Built on
8fe9e785ae04fa7c37f7935cff12d62e38054b60drm-intel-nightly: 2016y-01m-21d-11h-02m-42s UTC integration manifestTest
gem_ctx_basic:pass -> FAIL (bdw-ultra)
This is another 'returncode -15'. I think that's just some piglit fail or something. I think it would indicate someone sent a SIGTERM to the test. Not sure why that would happen. Some timeout perhaps?
Quoted 3 lines
Test
kms_flip:Subgroup basic-flip-vs-dpms: pass -> DMESG-WARN (ilk-hp8440p)
And that's the ilk underrrun thing:
https://bugs.freedesktop.org/show_bug.cgi?id=93787
Quoted 19 lines
bdw-nuci7 total:140 pass:131 dwarn:0 dfail:0 fail:0 skip:9 bdw-ultra total:143 pass:136 dwarn:0 dfail:0 fail:1 skip:6 bsw-nuc-2 total:143 pass:119 dwarn:0 dfail:0 fail:0 skip:24 byt-nuc total:143 pass:128 dwarn:0 dfail:0 fail:0 skip:15 hsw-brixbox total:143 pass:136 dwarn:0 dfail:0 fail:0 skip:7 hsw-gt2 total:143 pass:139 dwarn:0 dfail:0 fail:0 skip:4 ilk-hp8440p total:143 pass:103 dwarn:2 dfail:0 fail:0 skip:38 ivb-t430s total:143 pass:137 dwarn:0 dfail:0 fail:0 skip:6 skl-i5k-2 total:143 pass:134 dwarn:1 dfail:0 fail:0 skip:8 snb-dellxps total:143 pass:129 dwarn:0 dfail:0 fail:0 skip:14 snb-x220t total:143 pass:129 dwarn:0 dfail:0 fail:1 skip:13Results at /archive/results/CI_IGT_test/Patchwork_1256/
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: ✗ Fi.CI.BAT: failure for drm/i915: edp resume/On time optimization. (rev10)
Quoted 10 lines · Ville Syrjälä
Quoted 6 lines · Patchwork
== Summary ==
Built on
8fe9e785ae04fa7c37f7935cff12d62e38054b60drm-intel-nightly: 2016y-01m-21d-11h-02m-42s UTC integration manifestTest
gem_ctx_basic:pass -> FAIL (bdw-ultra)This is another 'returncode -15'. I think that's just some piglit fail or something. I think it would indicate someone sent a SIGTERM to the test. Not sure why that would happen. Some timeout perhaps?
This might be a false alarm as changes between v4 and v5 is just a static keyword removal and that shouldn't cause timeout to happen. V4 results seems to be fine. Shall we ignore this? Is there any way to rerun the tests apart from pushing patch again or debug this in case?
Quoted 25 lines
Quoted 4 lines
Test
kms_flip:Subgroup basic-flip-vs-dpms: pass -> DMESG-WARN (ilk-hp8440p)And that's the ilk underrrun thing:
https://bugs.freedesktop.org/show_bug.cgi?id=93787Quoted 18 lines
bdw-nuci7 total:140 pass:131 dwarn:0 dfail:0 fail:0 skip:9 bdw-ultra total:143 pass:136 dwarn:0 dfail:0 fail:1 skip:6 bsw-nuc-2 total:143 pass:119 dwarn:0 dfail:0 fail:0 skip:24 byt-nuc total:143 pass:128 dwarn:0 dfail:0 fail:0 skip:15 hsw-brixbox total:143 pass:136 dwarn:0 dfail:0 fail:0 skip:7 hsw-gt2 total:143 pass:139 dwarn:0 dfail:0 fail:0 skip:4 ilk-hp8440p total:143 pass:103 dwarn:2 dfail:0 fail:0 skip:38 ivb-t430s total:143 pass:137 dwarn:0 dfail:0 fail:0 skip:6 skl-i5k-2 total:143 pass:134 dwarn:1 dfail:0 fail:0 skip:8 snb-dellxps total:143 pass:129 dwarn:0 dfail:0 fail:0 skip:14 snb-x220t total:143 pass:129 dwarn:0 dfail:0 fail:1 skip:13Results at /archive/results/CI_IGT_test/Patchwork_1256/
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: warning for drm/i915: edp resume/On time optimization. (rev10)
In reply to [email protected]== Summary ==
== Summary ==
Built on b3f8ad64bc71f6236f05c2e9f4ad49a61745869a drm-intel-nightly: 2016y-01m-28d-10h-26m-23s UTC integration manifest
Test kms_flip:
Subgroup basic-flip-vs-dpms:
pass -> DMESG-WARN (ilk-hp8440p) UNSTABLE
Test kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-a:
pass -> DMESG-WARN (hsw-brixbox)bdw-nuci7 total:156 pass:147 dwarn:0 dfail:0 fail:0 skip:9 bdw-ultra total:159 pass:153 dwarn:0 dfail:0 fail:0 skip:6 bsw-nuc-2 total:159 pass:135 dwarn:0 dfail:0 fail:0 skip:24 byt-nuc total:159 pass:142 dwarn:0 dfail:0 fail:0 skip:17 hsw-brixbox total:159 pass:151 dwarn:1 dfail:0 fail:0 skip:7 hsw-gt2 total:159 pass:155 dwarn:0 dfail:0 fail:0 skip:4 ilk-hp8440p total:159 pass:113 dwarn:1 dfail:0 fail:1 skip:44 ivb-t430s total:159 pass:151 dwarn:0 dfail:0 fail:0 skip:8 skl-i5k-2 total:159 pass:150 dwarn:1 dfail:0 fail:0 skip:8 snb-dellxps total:159 pass:141 dwarn:0 dfail:0 fail:0 skip:18 snb-x220t total:159 pass:141 dwarn:0 dfail:0 fail:1 skip:17
Results at /archive/results/CI_IGT_test/Patchwork_1287/
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx